projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2f0bcd4
)
malloc: remove !gd handling
author
Stephen Warren
<
[email protected]
>
Sat, 5 Mar 2016 17:30:53 +0000
(10:30 -0700)
committer
Tom Rini
<
[email protected]
>
Tue, 8 Mar 2016 20:01:47 +0000
(15:01 -0500)
Following the previous patch, malloc() is never called before gd is set,
so we can remove the special-case check for this condition.
This reverts commit
854d2b9753e4
"dlmalloc: ensure gd is set for early
alloc".
Cc: Rabin Vincent <
[email protected]
>
Signed-off-by: Stephen Warren <
[email protected]
>
Reviewed-by: Tom Rini <
[email protected]
>
Reviewed-by: Simon Glass <
[email protected]
>
common/dlmalloc.c
patch
|
blob
|
history
diff --git
a/common/dlmalloc.c
b/common/dlmalloc.c
index 5ea37dfb6e4c334db262b6726bfff0e1d5362508..d66e80c647ce6b26b8a3a83a65808b0652d5600a 100644
(file)
--- a/
common/dlmalloc.c
+++ b/
common/dlmalloc.c
@@
-2184,7
+2184,7
@@
Void_t* mALLOc(bytes) size_t bytes;
INTERNAL_SIZE_T nb;
#ifdef CONFIG_SYS_MALLOC_F_LEN
- if (
gd &&
!(gd->flags & GD_FLG_FULL_MALLOC_INIT))
+ if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT))
return malloc_simple(bytes);
#endif